Redid syntax updates
More small syntax tweaks!