Second commit

A lot of small changes, too many to list...