Tidying up and bumping to 0.2.1.