updates to get the damn thing working