Updates to reflect current state

Also added more hints on editing.