fixed some issues with my prev merge