Added spotlight
Several last minute fixes