updated wrapper and minor edits