minor design issues (elie), bug fixing