add nutaq steps + fix lots of bugs + lots of improvements