some sanity changes