some fixes and limitation notice