General cleanup & add examples