Add different target environment. Some small improvements.