Improvements and fix syntax