cleaning stuff up, added new drive methods