two last fixes of app