some speed fixes;