Small changes to Structure.hs