Minor improvements.

Unresolved Issue: stack returns incorrect addresses.