fixes from testing with firmware