Woriking app
small fixes