Physics improvement and options added!