fixed some issues (numbers were off)