more fixes made