added comments and things