getting update going (plus some cleanup)