Naming convention + comments in README + minor fixes