Bug fixes, start on tell function