Proposed some fixes and tweaks