Update readme, fix bugs

@danrschlosser 
Let's leave these numbers in increasing order