Updates

and some fix and interface usage...cleard :+1: