Bugfixes
Added comments