add defaults and fixed