added float and other little things