final fix of signatures