PHPCS 60% and minor bug fixes