fixed some things. Added more.