bugfix + misc