Adjusting interrupt, misc. fixes