work on fixing rounding/etc issues