a lot of changes:

- mostly commons
- pictures
- TODO's