Add more defaults, update readme