Added terpsicore, modified giskard