review changes + bugfixes