Changed some method calls; updated readme and specs to match