bugfixes & framework improvements