Fixed all issues that came up in js hero other then for line 191