Fixed prior commit bugs and implemented wc