More syntax and fun fixes