cleanup
build fixes
adjust package name
build fix