fixed some open issues