good fixes and styles, some changes