[@Cephyl] All Fixed + Added some things