some changes that makes app work now