fixed the weird application bug and renamed stuff