Removed some constants that were no longer needed.
Added as a convience me.
Added more functions and streamlined the wrapper.