fixed some number issues