Readded DefaultController.php
Misc enhancements