Lots of tidy up, add notes, add sip view.