CTW prepairing & bug fixes