some cheap speed hacks
oops remove extra file
add time tests