even more fixes made