More tweaks to basic start