Last bit of code clean up, and bug fixes. Release?