Some more tests, fixes and notes.