fixed a lot of zvapp behavior problems