feexed more boogs
fixed bugs
gotta love merge conflicts that aren't actually conflicting