Fixed bugs, fleshed out few more macro ops, debug