major bug fixes. NUllpointer exception MindWvae