More Documentation an minor code improvements