Update

-Gratuitous self-refresh
-Properly clean up things