cleaned up some comments and minor mistakes