More notes

Please review and merge. Will keep working in this branch for now.