Bugfix
Added comments
Added comments