small changes to better support streamline's fast syntax