small fixes, mostly syntax stuff