A few more general improvements.
Added maximize option.