Better handling of properties and errors
Updating README