bug fixes and version out misplaced code