level3 modified, more fixes