hotfixes after brief meeting