Just add base address offset when reading symbols. Don't skip slot 0 of the stack. Offset call address by 1, to stay on current source line.
95a17fb