0.2a3

cleanup, renaming, minor fixes