Pull request/f47714df

Fixing serious bugs, getting more PyCall-like.