Add some shortcuts, docs, tests and some cleanup