Update: suzanne example set as default, several code cleanups