More tweaks to get it to alpha stage