- Some fixes and performance improvements!

Keep calm and code!