added a few more defaults