added starfield, inlined some stuff