Bugfixing and refactoring + Getting reloading working as expected