Fixes #94 and improves rank-activation