WIP: syntax & bug fixes