Code cleanup, added filename after load, save, etc.