Fixed credits timing and added them to extras