added more bugs fixing
picture