variety of fixes, moved js for doc to include