Modify WorkFlow, Add simple logic in TM, Fix further bugs