Added egg-locations
Added more sources, cleanup