bugs fixed app ready for second test round