Two more challenges

Also, fixed minor prime bug in previous challenge