NOT FINISHED: jshint happy but not jslint

As far as I couldn't finish it I just rolled back part of my changes. I
am working on Jiesa offline until I finish it.