1. Fixing JSHint validation
2. Fixing build