Pretty big update, too lazy to detail cause I need to sleep to study tomorrow