Bug fixes, abd README update