Final touches and better docs