bugfixing and importing comments