working hard on my bugfixes