Also includes some misc fixes in terms of comments regarding what packages should be updated with what.