Default options alterations & improvements
PHPDoc additions