fixed some errors after the merge