Clean up -main, change alias of demo-mem to d-m because I am into the whole brevity thing.