updates and clean ups

* provide more attributes