clean up, fixes, added new files