Updating: tidying up a bit
Updating: miscellanous