some style, some fixes, some code, some something