Final comments + Final bugfixes