Added more bugfixes