Dialog box fixing, etc. etc.