fixes, need to clean type arguments, remove Monitor