re-adding to eclipse, fixing errors