Tidying up + version bump to 0.2.0-alpha