Found more bugs... Fixed them...