fixing typos, python 2 and 3 support