syntax updates and some fixes