some whitespace fixes and a lot of updates to the new call syntax