Bug/slamupdates

Updates from the Liquid Poet's competition.