Update project, minor changes, added comments