Bug fixes and added quieter mode