Did some minor changes to ViperDotNet