updated memory issues, speed issues etc...