Add id to signs
Some small fixes
Development..