Small fixes and rewrite README