fixed up function calls, added ifs, fib numbers