fixing resource/glossary
fixing timeline 1
unswapping things