Added accepting user name, comments, and building (based on aki's files