Some changes/fixes [ISR0 works now]