Lots and cleanups based on PR feed back