Cleaned up code, fixed negitive location skrew-ups and added different color modes