Updated logging and fixed goof with stage look up