Added more crap for tracking, merged changes, fixed some values.
-Kramer