More work on combat routines and bug fixes