Minor changes; Still looking for decent pin protection