More bug fixes and getting package ready