[WIP][TASK] Made some improvements also made a os detection