Improvements + bugfixes