fix annoying reload issue
cleanups