Fixed last nights bugs