Bug/slamupdates

Updates as a result of the Liquid Poet's competition.