made a few things betterer