Fix scout, fix /class and remove death on class change