lots of updates

Just accept that I got lazy and couldn't be bothered committing these
changes before now