added fixes and updated some packages with help from hggomes