More cleanup & modifications. Also added some images. Not sure if they should live here...
Improved some helper functions