clean up shortcuts
more tests
version bump