Improving docs, adding :lemon:, bug fixes