Clean up, organize examples, fix bug