fixed new bugs
popup issues
new optimization