fix stuff and add stuff