More options and cleaned up