jslint changes; merged; ready to test