added mouse to gauge obj and cleaned up