Changed some default settings and some code cleanup.