debugged a bit of app