Buxfixes and syntax fixes galore!