stronger attributes support & minor fixes