Update readme, fix bugs

@danrschlosser 
thanks for the heads up!