updating with new bugfixes