General Update

Name changes, compacting, added features