cleanup; correct users handling
version bump