bugfixes and more implementation