added some stuff that i forgot to commit a while back;