Further syntax fixes and changes to combine method