code fixes and chsnges
fix