Proposed some minor fixes and tweaks