Starter timeline & bug fixes