Refactored options stuff to own class
Added debug flag to Makefile