Bug fixes I hope
and README.md update!