Added app config changes and other bug fixes