Resolved conflicts with jirwin's code style.
Less stupid javascript.
more dots