more fixes i hope