more attributes bug fixes