Add more documentation
Cosmetic fixes