made some changes, added some stuff.