moar comments added to beta + bugfixes