Small modifications - Added some messageboxes
Started working on Comments support