Some cleanup, will keep getting better
Bug fix, and add credit to readme