updated entities to use traits, visual changes