Minor tweaks to build order and research choices