requirements + syntax fixes