bugfixes & runtime context