Fixed some bugs detected during testing and changed some default values to more sane values