Documentantion and minor bug fix