Some fixes and some stylings