syntax fixes, fixed #27