more Fixes + review fixes