finally ironed out all issues