Bugfixes and imporvements (integrated review feedback)