Fixes, simplification, and readme.