Letza go!
Some fixes and updates ( ͡° ͜ʖ ͡°)