Bugfixes and code-additions inside framework/functions.php