Implemented Andy Lesters recommendations. Did more light editing.