mini improvements and fixes
merged conficts and some little updates