fixing stuff from merge