[Feature] Fix TODOs present in the code

[zAlweNy26]

Is your feature request related to a problem? Please describe. There are some TODOs present in the code that should be fixed.

Describe the solution you'd like There should be a fix for each TODO, also replacing the current workaround code if needed.

[kodaline]

assign me @zAlweNy26 if you want 😸

[zAlweNy26]

@kodaline have fun! 😄