Various adds

Shorten names
Code reduction
Js links