Stack traces working!
General cleanup.