syntax fixes, some basic functions