fix issue #5 and corrections