Bugfix and enhancements (hopefully)
 * Configi