final fixes
tmp merge
added fixes