fixed repeat call bug, updated wrappers