Fix for bug #46 - CLOSED
Minor changes to use battleLayer references.
Few minor change.