code fixes and chsnges