added fog, cleaned up