quick & dirty mapping error fixation
Merge branch 'research.persistence' of github.com:kewgen/aow into research.persistence