add some attributes and some fixes