Corrected some design issues pointed out by Eyal.