fixed some 'things'