Fixed indentation, added more config options