- fixes for full review;