some fixes to use pushed clarity patch
tried full analysis