Fixed some file versioning, and style bugs.