syntax updates before merging with master
commented out failing tests to see if travis likes it