Starting some cleanup and bug fixes