update new syntax and tidy up
wip
meta magic