Building Package

Fixed some example code I didn't like, etc.