Fixed Timer issues, and Eclipse issues