Various minor cleanup, note that skills adding still broken for players.