Small modifications, mainly pushing to continue working on different pc.