Switched IDE's, cleaned up TODO's a bit