bug fixes
move conf into package for setup