B00ngiE got some fixes YAYLL >:B