minor updates and testing