Updated Material. Added CB's jline. Fixed mappings. Fixes #4