fixed float cuepoints and simplified