Minor edits, reload no longer creates weird errors