further cleanup
Update some files