fix modules and add status