Bugfixes

Andrew:  OH YEAH!
!!!!!!!!!!!!!!!!!!!!!!!!!
HE:"S THE EXTERMINATOR
BUGKILLA