removed some globals and replaced them with Config-Model #117