further review bugfixes