package +other minor fixes