fixed issues 2/3/4