* fixed stuff