Fix and add stuff