[EDIT][!] Fixed some warning mostly relating to missing comments