latest syntaxis improvements