Fixed a few bugs. Put mores stuff in the global configuration
Fixed a merge problem