new version of AP data, more fixes to javascript