more stuff, rewrote intro