Fixed dev env
Several changes