quando today fix, comment limit to today
minor fixes