Cleaning up some stuff and fixing troll keys...