Added options and jshint fixes