Adding Wrappers to config and fixing minor bugs.