JSHint changes, added TODO comments/questions