fixed hotreloading, formatting changes