Cleanup, add obfuscated id's, bug fixes
Remove debugging statements