ResultActivity added + old bugs fixed