fixed things, added stephen's things