Shell language syntax improvements and various bugfixes