fixing application bugs