fixes and cleanup for lab tonight