Fixes Bugs and config issues