Bug fix and clean up
Edit some comments
Add some files from userdata