improvements + bugfix