updates to syntax issues; tests clearing now. #525