New Features

Align and interrupts. Cleaned up some code