todo and starfield tweaking