fixed errors, combined comment not working yet