Finish comment functionality, bugs fixed