VAE modifications

Alright!