Fixes, tests and comments for shifter-core; version 0.3.96-SNAPSHOT