js things and small fixes