removed stats for now
cleanup
added predefined images, cleanup
more tuning