Fix monitor and add all the missing files