Improvements to go in sync with wiki page