Changed some default settings. Removed some unused functions.