Improved vim syntax/indentation added.