General cleaning

Added comments fixed syntax errors