+ fix a few typo/style stuff