Implemented new Features

Implemented Comments etc.