removed unused images, minor code cleanup, added option samples