Several fixes to source and configuration

Hey,

attached are several commits fixing some details in the current implementation. Please have a look and tell me about any comments.

regards,
Simon