Added marker icons. Changed problem generator.