Fixes to timeline behavior, cleanup of assorted bugs