Misc cleanup. Update docs