fix slow reloading
add validation