Edited config

Almost ready for v1.5pre1.....