Options are now called from a function
Fixed option in Makefile
Raw dumps now use option file