Fix and adjusts to run application