Bugfixes + require versioning