Made changes based on zoggy's recomendations.