added more convenient bindings, some cleanup