more Lib Updates & mistake fixes