Removed some bugs, added unique ID
Removed more bugs