Bug fixes and getting ready for initial release