Small bugfixes
Working at ai