Started OneCode, minor tweaks