fixed eclipse, edited files when did so, here are the changed ones that work now
Sync with Andrew