remove comments, bugfixes
merge