Fix Python 3 issues. Update member names to track development