fixing comments, 405 problem
merging