more stuff modified to get updates / packages working correctly