fix starfield config
merge with master