JS improvments
	- Improves some behaviours