Wrapped more stuff, added some convenience methods and fixed a major oversight.