bugfix + continued with features