renamed and reordered some speed-related methods
more comments, better formatting