Fixed engine memory issues

Timer memory issue, EntType moved to Entity (so that it works with
entities)