Added comments
Bugfix program