updated the conversion scripts to handle mixins better, and to fix other issues such as comments, newlines etc