go back to one activity entry at a time plus bug fixes