minor updates and tests