Improving docs, missing unit tests