Minor fixes
Removing PIV module - breaks syntax highlighting