Bug fixes, still issues with config