minor updates and cleans