Updates + python 2.7 compatability