Added CI stuff, some fixes