API and minor eclipse work