update some info
Merge pull request #1277 from conejoninja/hotfixes

update some info