Did some fixes, removed doc ready, also refactoring