Started added config, updated handler, fixed some MORE bugs