Removed unneeded comments + bugfix