Add some fixes and style changes