Added/fixed a few things