fixed some funniness