Fixed comment drawing and options and menus
Fixed comment and wrapping issues