Changed enums, added more to bindings, and tweaked example