More options, added target clean and rebuild