cleaning up
corrected speed issues