Final Code Touchups