Some updates. JS still broken...