fixed some errors from merge
minor changes