updated for new release
fixed typo
removed some test code