Updates and some core JS improvements