fixed wobble, removed old TODOS (up to date)