fixed syntax/types issues