few updates/fixes/local support