better skill calc, routing improvements, remove stuff