Review and merge mtgrosser's changes!