mainly fixes