Fixed some issues, mainly surrounding the 'call' clause.