Some fixes, removed underscore dependansy for one command