login works; plus other edits