added some new entries for the config
fixed 1 bug and changed some things