bugfixes and fixed grammar issues