Fixed Some bugs
Fixed some bugs here and there
Merge https://github.com/gkhartman/SafetyTracker