fixes related to new time estimation, shortened filenames in some places