added user config data bags and cleaned up a few files