added cnam
removed crappy js
removed crappy js
more fixes