minor cleanups and fixups!
minor fixup with the package name