V3.0.1 vip

Whitespace/syntax cleanup
Adds additional filters/fixes