works on fixing comments