Bug Fixes and New Config