fixed some recreate and reset issues, improved formatting