various fixes & spotlight editor enhancement