added some stuff that i'm sure is useful