jshint updates
Activity stuff start