fix 301231
fix 500
Merge branch 'master' of https://github.com/Finnegan2100/sesameEngine