temporarily use a beefcake branch
Be more noisy on errors
Fix some serialization and spec issues
Remove some debug output
Load batch map