Improvment on Fields, Combos

Started refactoring damage system. A bit. It begs for bigger
reorganization.