bugfixes nad new features