manual and small dev mode fixes