changed some set-defaults stuff