Tightens up default settings
Merges Seth's changes
Deletes unused js