More cleanup, fixed skills being royally fucked up