some fixes in 2