fixed things, testing