added more defaults and fixes