Update: misc updates to match current ics branch