Winterland: 6/18 update

fixed minor bugs