small changes to layout and fixing comments