added more things that should've been in there.