Package change & some minor clarifications