Revamp logic; update abilities and some moves