2.5.2

Squashing one large bug. Adding a bonus.