Critical fixes.. new version.. unicorns to everyone :muscle: