fixed some issues that came from the merge