Fixed Type, added ability to edit