Various

Just some syntax changes!