Bug fixes

I put the code in a package.