Comment functionality, fixed apostraphe bug