fixing up things