added some minor changes, fixed some stuff