add comments + bugfixes