Bugs fixed, elbo added