Switched to new instructions and other bug fixes