bugfixes mostly JS related