Entities, Terminal

Renamed Terminal to Console (overriding default)
Redid some entity stuff