Cleanup
Add in JFrame icon support + icon