bunch more stuff, will edit again in 30 minutes

bunch more stuff, will edit again in 30 minutes