refactored char, refactored app, some bugs x2