Academy RPG added + fixes