Code tweaks
Work on attributes fixtures
Update README and CHANGELOG