'fixed' performance issues

not perfect yet