Added/improved some bits