fix bugs + beautify code + complete work schedule