adding build comments, some bugfixes