Fixed docs issues;
Cleanup