some changes + speedimprovements