Testing, fixes and some documantation