cleaning up, preparing to merge with master