added a few carryovers from linux