Added/tweaked some things