Added more options. Cleaned up main a bit.