Update Docs & Some cleanup