minor adjustments and resolved #6