Updated changelog, tidying up