more fixes for front