Merge Sortokk's Changes | Slight Fixes