beginning hot reload support hurray! and other minor modifications just for fun :)