Move configuration vars into wacs-configuration

Also get rid of a bunch of compiler warnings