fixed a million things also added a million things