application + various fix