3.0-dev1 update 10

Small changes & fixes