Bug fixes and more optional settings