Finishing touches on battle system