Superficial changes, mostly notes to myself