Bugfixes
Comments , improvements

Minor improvements, removal of console logs, comments