Fixed: Get commands straight from CommandMap

Also, updated for new double health