fixes for bugs (start)