More edits but not certain if they entirely work

aictab