cleaned up some code, got fib/factor working

perfectly, i believe.