refactored a bunch of stuff. removed unnecessary wrappers around primitive types. broke half the examples