minor fixes
fixed for massive changes