VAE modifications

Whoa, good catch!