nvm > nave plus a couple minor tweaks