minor corrections & design improvements