closed #4 again
minor adjustments