Improved Documentation and bug fixes