Added extra documentation and fixed naming