Setting the processor options 

See #521. Also updated a few header files