Added Config only option, Fixed various bugs