fix var names
better services initialization