Improvements + minor bugfixes