More comments, some new files and clean up