Changed order of logcall.
New minor changes.