envers, libs, small changes