got rid of try/catch mess
fixed dup bug
revert
bugfix
debug easier
bugfixes
bugfix