Bugfix: Library scopes, pushed around some functions.