Actually fix said respawning thing.  As well as a derpy programming error