Fix stuff and add missing files