fixed few things that makes the app working better, though still broken