More documentation and convetion changes