Minor updates. Getting there!