Improving spotlight and fixing grunt config