updates, still issues with Intent