Some finishing touches and better docs