Remove more commented out code that has since been implemented
Added the ability to specify the default document