syncing fixes so that Angular works