Bug Squash

Tracker View Bugs Squash, still quiet buggy