Fixing positioning and comments