some strange fixes
works
some cleaning