clean up + can set width, height from cmdline