Another bunch of tips merged...