Lots of small updates (see readme)