minor updates and test