Code Sniffer Issues & other changes