syntax fixes + libs