More bugfixes; removed some unnecessary methods; simplified some mehotd