fixed js issues.  debug jquery issues
merged with nate changes