minor updates and cleaning