Minor bugfixes and cleanup
Example user images