Fixed notes system, refactored CTarget