fixes for previous commits and cleanups