Many fixes
Small fixes