fixes, added defaults