typo fixes, 1.9 support, added scenarios