fixed additional issues