added interrupt routines, cleanup for succesful build