#448 Lot's of small tweaks after people's feedback to the new iA

See #448 for context.