Add scene setter/getter to Entity
Use Entiy\scene setter and fixes

* Two typos and one logic error fixed