Modified build system to allow options

Misc. Changes