Update 1

Added more Veil features/switches. Cleaned some code.