fixing stuff -mike