Lib Update and bugfix