Updated config and minor bug fixes