More work on enemies; mostly trying to fix fake AI
Merge