fixes and enhancedment coming out of review