some interrupts added, and makefile corrected