Adds Lichen type, shuffles around some functions for organization, fixes typo.