fixed some minor changes