- fixed some speed issues