Update and cleanup more docs