Minor Changes, reworked some mechanics