better fun names
#92 is fixed
minor