polish and linking re: package stuff