A couple of package additions and some misc. changes