Handle renames better. Closes #11

Also fixed deprecated methods for setTimeout. I hope that works.