fix(): Fixes small issues and cleans code, wipes most warnings