added comments support (still not working properly