testing and some fixes