added some things, fixed some things