fixed things, got rid of other things