Resolved a bunch of syntax errors
More work on making Python 3.3 pass tests