Added/fixed stuffs