Finishing visual touches
undo testing changes
added comments