small improvements and external config