refactor of symbol resolution and state control flow
removed action-idx and added alias support