Clean up, fix bugs, new icon, and now it works.