fixed some styling issues
fixed merge and other small issues