some fixes and style completed