Combat framework... part 2

nothing major, just removed the command/hack console and fixed some
errors I spotted