Added some calls, minor cleanups.