Major update; everything seems to be working