Some fixes, some edits