refresh with bugfixes