Merging wookietreiber's changes, resolving some conflicts